* window.c (Fprevious_window): Use FRAME_HAS_MINIBUF_P to decide

	if the frame has a minibuffer; FRAME_MINIBUF_WINDOW points to the
	surrogate on minibufferless frames, not nil.

diff --git a/src/window.c b/src/window.c
index 96606a8aa6d58f5526d4c4014d2dee42a15ba8e6..655515182ce009e3f630e57290984894dc7ef580 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -978,8 +978,9 @@ windows, eventually ending up back at the window you started with.\n\
 #endif
            /* If this frame has a minibuffer, find that window first,
               because it is conceptually the last window in that frame.  */
-           tem = FRAME_MINIBUF_WINDOW (XFRAME (tem));
-           if (NILP (tem))
+           if (FRAME_HAS_MINIBUF_P (XFRAME (tem)))
+             tem = FRAME_MINIBUF_WINDOW (XFRAME (tem));
+           else
              tem = FRAME_ROOT_WINDOW (XFRAME (tem));
 
            break;